Merge "NuPlayerRenderer: use timer for video rendering"