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

Change-Id: Ie8aee4964e82301c4a2652da3f6df9674c762839