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