Merge "Fix IndexOutOfBoundsException while handle app crash" into udc-dev