Merge "Keystore 2.0: Reinstate the default busy handler."