Merge "Change the Theme of the ECBM AlertDialog" into pi-dev