Merge "Prevent SurfaceFlinger from turning on display on quiescent boot" into main