Merge "Change SIM dialog activity theme" into sc-dev