Fixed NPE when entering from widget

Refactored some of the method and separated FolderWatcher
to avoid some potential null pointers.

Bug: 8422395
Bug: 8420568
Change-Id: I5aea32eb00242fb24c52ae620f2ec0c0ef1e8efd
1 file changed