Merge "Fix settings restore" into jb-mr1-dev