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

Change-Id: I4d7d38204bc89dd66388eeb6c5a449e1442a890f