Manual cherry pick of pixel ladder shape fix

Yee Chinn Yaprequested to merge
yyap/athena:cherry-pick-3e1b9f5e-21.3 into 21.3

Fix for overlap in Pixel. Manual cherry pick of MR !34961 (merged)

Edited by Yee Chinn Yap

Merge request reports