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