Merge "Don't draw synchronously in onResume()" into jb-mr2-dev