Merge "On orientation change, update rounded corners" into pi-dev
am: 4524e93577

Change-Id: Ic1e099cd80a95527e8322dbfe5ee225b441338e6