Merge "Use isCeStorageUnlocked() in storage wizards" into main