Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev