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