Merge "Keystore 2.0: Disable BackendBusyException."