Merge "Limit maximum number of concurrent keystore operations."