Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev