d0865f8219
Test: Ran all set page in landscape/portrait, dark/light mode Fixes: 190828563 Change-Id: Ie7fbc6ce6777e9cec8d4dcb5dff3090dc167a161