Merge "[Contextual Edu] Store keyboard shortcut trigger time" into main