Merge "Merge "Merge "Fixed the flickering of the corners when collapsing the...

Merge "Merge "Merge "Fixed the flickering of the corners when collapsing the shade" into rvc-dev am: e4b658e0 am: 6a2139f5" into rvc-d1-dev-plus-aosp am: 0b936d0f" into rvc-qpr-dev-plus-aosp am: 669c0d30

Change-Id: Icf993a415f8e91439860d7f4ca35899cb22cd5da