Merge "Use heif embedded thumbnail if available" into pi-dev
am: 47887b0b52

Change-Id: I8456069ca8f2f6ad0b89ccb3dfbc9fe958538a90