Merge "Move global sync settings dialogs to the right screen" into lmp-dev