Merge "Fixed the flickering of the corners when collapsing the shade" into rvc-dev