Merge "Fix managedProfileUnlock_stopped"