Merge pull request #14602 from EragonJ/bug-947432

Bug 947432 - [DSDS] Marketplace and Payment indication in Settings
(cherry picked from commit a71f70f131beb6139433ed72b679111da40c0291)