Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread