Merge "Validate phone ID before using" into main