Merge "Keystore 2.0: Rename Keystore 2.0 enable property."