Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-qpr1-dev

* changes:
  [automerge] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing 2p: 18ddad1f5a
  [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing