Merge "Forcing closing QS when going from SHADE_LOCKED to KEYGUARD" into tm-qpr-dev