Merge "Apply the final modifier to KeyStoreManager" into main