Merge "Making SysUiState's QS expansion flag require shade expansion" into tm-qpr-dev