Merge "Use heif embedded thumbnail if available" into pi-dev