Merge "Fix thumbnail track skipping" into pi-dev am: 9b2aa31c73
am: 4accad2f3a

Change-Id: I5f7eb0523fe146a86491f59030a4557a2722e5e6