Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev