Merge "fix for pause when loading" into honeycomb-mr1