Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev