Merge "Pull out Settings usage into utility"