tree 3b71bce33e20068c757fbdba6783e0f3ffc0b01a
parent 69a7768ea63b3d8013faa691f07b1bdd503ede71
parent a754e678a7a2fddfa716783f8c5f2fc99da68973
author Jonathan Miranda <jonmiranda@google.com> 1624570150 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1624570191 +0000

resolve merge conflicts of a754e678a7a2fddfa716783f8c5f2fc99da68973 to sc-v2-dev

Move qsb according to spec.

Bug: 175329686
Test: visual test
      checked 5x5 and confirmed no visual change
      checked 4x5 and confirmed visual change
      - tested various display sizes to ensure no overlapping is caused


Change-Id: I5e00fcf57ffde597c6af08c6464ddfd7e8456bca
Merged-In: I95a80b484516f634fa13347534810c7a51cecc8d