Merge "Use inotify to update DocumentsUI." into klp-dev