Merge "Do not expand quick settings when shade first opens" into sc-dev