Merge "Use isCeStorageUnlocked() in window manager" into main