Merge "Remove EdgeToEdgeActivityContent" into main