Merge "Keystore 2.0: Enable by default." into sc-dev