Merge "Reduce MAX_SECONDARY_USER_ID by 1" into main