Merge "Merge "Changes to MediaProjection UX." into qt-dev am: 7b25470f am: 309228c2" into qt-r1-dev-plus-aosp