Merge "Re-add preinstalled for SYSTEM_ALERT_WINDOW"