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

Change-Id: I2cb3fff4f5ee3c4e8fc3d4f47cd3957a6ca7c3e3