Merge "Change the Theme of the ECBM AlertDialog"