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

Change-Id: Ifa0e3c5ec1114b50d9b9b9860aec87dff718d551