Merge "Fix Settings writes to a different user" into jb-mr1-dev