Merge "Fixing QS appearing when going from AOD to unlocked in split shade" into tm-qpr-dev