Bug 1040290 - remedying the visibility conflict between the value selector and the system dialog that triggers it.
Merge pull request #21945 from yzen/bug-1040290

Bug 1040290 - remedying the visibility conflict between the value select...