Merge changes from topic "am-f87fc8eeddc24f76b86e563109ce3ede" into udc-dev

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc3 am: 2fdf59ef -s ours am: 1702e5f4 -s ours am: ea27062d -s ours am: 33252b72 -s ours am: 10f3f477 -s ours
  [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc214696 am: dc0ba857 -s ours am: 5820c126 -s ours am: ed5079e9 -s ours am: 4d41bd1e -s ours am: 3e6c06d1 -s ours