Merge "Disconnect BLE on Unlock" into qt-dev