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

Change-Id: Ie1fa9752c13c2647af329116617a952d571a1860