Merge "Fix thumbnail track skipping" into pi-dev