Merge "Fixed the flickering of the corners when collapsing the shade" into rvc-dev am: e4b658e0d4 am: 6a2139f597

Change-Id: I2a55a37788cd9011cff727ab5f93909ca9de9d17