Fixes wrong mapping of picture controls on OSD"

patch by <warpme@o2.pl>

Fixes #11983 and #11885