Merge "Respect android:turnScreenOn on non-default displays" into main