am ee067769: am 26cbb806: Merge "Don\'t draw synchronously in onResume()" into jb-mr2-dev

* commit 'ee067769eacfb9e9ce20b6382a772f6b2758bc96':
  Don't draw synchronously in onResume()