Merge changes from topic "am-c8fb36785cbb49c681e79f7b7c6925fc"

* changes:
  [automerger skipped] Merge "Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE]" into tm-qpr-dev am: 20bcbf38 -s ours am: 3276bd97 -s ours am: 08fe019d -s ours
  [automerger skipped] Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE] am: 831787c5 -s ours am: f5a132b7 -s ours am: 240896ad -s ours