Merge "credstore: remove unused variable" into main