Merge "fix crashing apps" into jb-mr1-dev