Merge "Make ContentChangeFlow public" into main