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

Change-Id: Ie90f31b04b4d3e10140ec2dee3b306fb9c984416