Merge "Make notes shortcut visible only after both selection and stylus usage." into main