Merge "Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev am: 127a4c9014 am: be56a66a73" into oc-mr1-dev-plus-aosp
am: 889cdffe27

Change-Id: I9301ed2678dd15df0e44bb5aa54c7c41bbd0e23a