Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev