Merge "Fixed out of bounds exception while handling app crash" into mnc-dev