Merge "Add MMS_ERROR_MMS_DISABLED error code" into main