Merge "Reland "Defer triggering notifyLidSwitchChanged() until the system is ready."" into sc-dev