Merge "Force disable Note Task Shortcut" into main