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

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