Merge "Only run htmlToSpan task if the body wasn't restored" into ub-gmail-ur14-dev