Merge "Restrict SimDialogActivity" into udc-dev