Merge "Fix keyguard -> shade_locked scrim transition" into tm-qpr-dev