Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev