Merge "Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev am: 127a4c90 am: be56a66a" into oc-mr1-dev-plus-aosp