Merge "Fix preferred apn not selected when back from edit" into main