am f6fcea60: Merge "Fix issue #8325007: EyeEm app crashes on launch- NPE at..." into jb-mr2-dev

* commit 'f6fcea602750bbc0eb7d394f4daf3848ffaaed7d':
  Fix issue #8325007: EyeEm app crashes on launch- NPE at...