Bug 934139 - [v1.2] Update videoplayer app and tests to be in line with master