Merge "Further fixup of migration to global settings" into jb-mr1-dev