Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev