Merge "Fixed the flickering of the corners when collapsing the shade" into...
Merge "Fixed the flickering of the corners when collapsing the shade" into rvc-dev am: e4b658e0 am: 50d61080 am: 6ebfab9c
Change-Id: I7bc7bbd2926b1ba48bee5434fa47a336e7bc5417