Merge "Don't show video overlay when no video is present"