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: 8947a29f
Change-Id: Iee2215a217cafbc848dbb8a2620e4a8deece705a