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

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