Merge "NuPlayer: use width and height from tkhd for display and thumbnail."