Merge "Add activeUnlock config to force dismissKeyguard"