Merge "Changes to MediaProjection UX." into qt-dev
am: 7b25470fd9

Change-Id: I273ae95ae8c4ad6245cfe79fffe9d02c85ed13cf