Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev am: 9da5ee9e29
am: 364eb7bbb1

Change-Id: I267bdffd8599daf91dcc6c8a8b707fe3b756eee7