Merge "Fix issue #3377999: Activities need to be stopped when sleeping" into honeycomb