Merge "Add custom widget category for Note Taking" into udc-dev