Merge "Revert "Move MediaProjection classes into more specific package"" into main