Merge "Remove a duplicate method in camera compat." into main