Merge "Don't exit lock task on sleep"