Merge "[ActivityManager] Fix IndexOutOfBoundsException"