Merge "Make the Media Projection dialog consistent (1/3)" into tm-dev