Merge "Remove keys from adb_keys after period of inactivity" into qt-dev