Merge "Making sure QS are not closed when split shade is open" into tm-qpr-dev