Merge "Merge "DO NOT MERGE Disable overlays while installer is resumed" into nyc-dev am: ed85c9492b" into nyc-dr1-dev