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

Change-Id: I943db8a557e311d845b9550a52dda8d286864cf6