Merge changes from topic "am-db8c42ea-b1e6-42b0-85eb-9b241b1e6d97" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 172eddd2ff am: 1ef521c140 am: c5e6550127
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 172eddd2ff am: 1ef521c140
  [automerger] DO NOT MERGE Disable overlays while installer is resumed am: 172eddd2ff
  DO NOT MERGE Disable overlays while installer is resumed