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

Change-Id: Ia3f2c69dc17dc26534ef7264ce87932915f03e3b