Merge "Fixed the flickering of the corners when collapsing the shade" into rvc-dev am: e4b658e0d4 am: 6a2139f597

Change-Id: Iffe4ae922032f36409a45b8f461483fb18c625e2