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

* commit 'd118394d444107dba4430723d248863ff412c444':
  Properly handle cases of multiple inotify events