am 6d738bc5: Merge "Only run htmlToSpan task if the body wasn\'t restored" into ub-gmail-ur14-dev

* commit '6d738bc56d3a69e5d82427d0f0a2fc958b8cf5cf':
  Only run htmlToSpan task if the body wasn't restored