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