Merge "Use Note Role Holder when opening Note Task" into tm-qpr-dev