Merge "Minor cleanup of KeyguardViewManager"