Merge "Add config for registering shell task organizer" into tm-qpr-dev