Merge "Fix canAffectSystemUiFlags"