Merge "Add flag to change to the new APN page." into main