Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev