User capabilities of moving activities and updating course settings within a course are bundled together under moodle/course:update

Currently, in order to give a non-editing teacher permission to move an activity, we also have to give them the ability to update the course settings and to add, update and delete activities.

Steps to reproduce:

1. Within a course go to 'Assign roles', 'Override permissions' and choose 'Non-editing teacher'.
2. Change moodle/course:update from 'inherit' to 'allow' for a non-editing teacher in a course
3. Change the moodle/course:manageactivities from 'inherit' to 'allow' for a non-editing teacher.

Actual results:

A non-editing teacher can move activities within a course but also update the course settings and add, update and delete activities.

Expected results:

It would be good to allow a user to move activities within a course without them having the ability to update the course settings and add, update and delete activities.