Merge "Delaying building of hardware layers when Launcher is resumed"