Bug: 126566208 Test: Manual verification, both orientations Change-Id: I971a033628a56c41c7c926d519106114c66bce80