Fix NPE on login.
Revert "Fix NPE on login."

This reverts commit 6eeac845d82cc85ba15b513d9f10f632623bcdf2.
Merge remote-tracking branch 'upstream/master'
Fix duplicate appearance of All Stories heading.
Merge pull request #225 from ojiikun/master

Android: Fix duplicate appearance of All Stories heading