Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED"