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: 6a2139f5 am: 49e591d6
Change-Id: Ib961584ceaca4974aace1c27c428598c262fa702