Merge changes from topic "am-0d938f512276434a8845d727082fd8a1"

* 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: b789f3f7 -s ours
  [automerger skipped] Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE] am: 831787c5 -s ours am: f5a132b7 -s ours am: 9f50a3a6 -s ours