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

Change-Id: Iff1167256c76798124abda04240f8e412b39d38a