Merge "Fix resumeWhilePausing not working"