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

Change-Id: I0545b3bb6eae3ff6a09dc348e115f5630afe970f