am 17732ff1: am 142155b5: am 3377b404: Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev

* commit '17732ff107706d1e816d45307594e8b73f8bb01b':
  Fix for bug 7358703 Gmail ANR when trying to compose a message