Bug 947865 -[Cost Control] Settings are broken and unusable
Merge pull request #14498 from gitmai/bug-947865-broken-settings

Bug 947865 -[Cost Control] Settings are broken and unusable
r=salva