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

Change-Id: I20ff3c4d2386eaede56a62ea344c701111d58d05