Merge "Add monitoring to note taking experience" into udc-dev