Merge "Change window type of Media Projection dialog" into sc-v2-dev