Merge "Fixing broken shade after unfolding during expanding QS" into udc-dev