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