Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev