Merge "Log all individual settings restored" into jb-mr1-dev