Merge "Fix NPE in FileObserver when multiple events pile in for a defunct observer.  Also, fix up some bogus whitespace (hard tabs, etc)."