Merge "Add Note Task shortcut" into tm-qpr-dev