am a0400e1c: am f61dfd1a: am ad72e170: Fix launcher2 crash.  We weren\'t initializing the list of folders.  Bug 2210545.

Merge commit 'a0400e1c3584c54d0843a1867989dec4f0dd7bb4'

* commit 'a0400e1c3584c54d0843a1867989dec4f0dd7bb4':
  Fix launcher2 crash.  We weren't initializing the list of folders.  Bug 2210545.