Merge "Ensuring QS can't collapse (hide) in split shade" into tm-qpr-dev