Merge "Cleaning up some synchronous event registration in Views" into main