Story 44036581: Also showing description in reg mapper for selected controls
Story 45203033: Centering the resizing around content intead of widgets
Zero-diff merge of 'origin/master' to synchronize the same commits between the two branches (sorry Dan)