Merge "Settings: Add setting to clear adb public keys"