Merge "Fix crash in existing applications Bug #5659476" into ics-mr1