Merge "Add a null checking for heic thumbnail data."