Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev