OZP-54: Desktop pane code review fixes
Merge branch 'code-review-fixes'
Merge branch 'master' into feature/ozp-245-floating-widgets