Merge "Use heif embedded thumbnail if available" into pi-dev
am: 11d203ea0d

Change-Id: I99ecf1986d921c00f70e7b9dbd2a8c67c5c9a923