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

* commit '020e7a51bd922ec3e4a3a8530c48b2597f313988':
  Only run htmlToSpan task if the body wasn't restored