Merge "Update proper PhoneStates on SIM status tabs"