Merge "Move AlertDialog to SYSTEM_ALERT" into oc-dr1-dev