Merge "Fix KeyguardController::mDisplayStates leak"