Merge "Do not set AdbKeyStore to null when ADB is disabled"