Merge "Fixing mQsVisible state in split shade" into tm-qpr-dev