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

Change-Id: I8e2e6d179d3928efbc73880445c15275864275e9