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

* changes:
  [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
  Hide non-system overlay window on ActivityPicker