Compatibility - Picture-in-Picture - Attempt solution to #661 and #885.