Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into mnc-dr-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22 am: 4fe58458a5
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564 skipped: b91a366e22
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0 am: ffe005e564
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6b0
  DO NOT MERGE Disable overlays while installer is resumed