Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev