Merge "Crash after unpairing BT keyboard" into klp-dev