OZP-54: Desktop pane code review fixes
Merge branch 'code-review-fixes'