Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev