Merge "More-centerize the quad color checks" into stage-aosp-sc-ts-dev