Merge "Use SYSTEM_... window manager flags"