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: I7388baa16b69e0b5d8822fb1215785d850709462