am d8a05b9d: Merge "add GIF fallback support" into jb-ub-mail-ur10

* commit 'd8a05b9d0fb891b51dcc2e5d29bd1d2232f5b570':
  add GIF fallback support