Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev