Merge "Avoid showing DeviceAdminAdd screen in the background of support dialog." into nyc-dev