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

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