Merge "Remove keystore entries when app data cleared"