Merge "Don't let KeyguardSliceView touch display borders"