am f2af7545: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'f2af7545c711c2aac5231105f5b4642cd73d2349':
  Fix Email Widget crash.