Merge "Move SecureStorage interface out of staging" into main