Bug 937336 - Remove where possible explicit frame switching

Remove explicit frame switching *and* unneeded locators from videoplayer app