Merge "Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE]" into tm-qpr-dev