Merge "Fixing setting mQsExpandImmediate state in correct context in split shade" into tm-dev