Merge "[Contextual Edu] Use new GestureType from educationLib in SysUI" into main