Merge "Add test case for KeyguardController::mDisplayStates leak issue."