Merge "Update stylus shortcut condition" into main