Merge "Track lock state per-display in KeyguardController"