Merge "Avoids systemui color tint flicker because no system ui flags set"