Merge "Simplify some code in NuPlayerRenderer"