Merge "Fixes set lock task (and screen pinning) state with/out quickstep"