Merge "On orientation change, update rounded corners" into pi-dev