Merge "Redirect to new APN edit page" into main