Bug 1074123 - Fix update and quick settings dialogs
Merge pull request #25042 from mikehenrty/bug-1074123-part2

Bug 1074123 - Fix update and quick settings dialogs