Merge "heif: address api review comments" into pi-dev