o.c.display.pace: Adjust pvmanager-dev merge
Merge remote-tracking branch 'origin/master'