Merge "Add missing resume() call"