Merge "Fix the user ID check in note controller for updating note taking shortcuts" into udc-qpr-dev