Fixes to pad OSD

Carlos Garnachorequested to merge
wip/carlosg/pad-osd-fixes into master

Some fixes and small code improvements to the pad OSD.

Fixes: #2570 (closed) and #2845 (closed)

Merge request reports