Merge "Rename system-api wm flags to SYSTEM_..."