Merge "Fix task missing after dropped an app in PIP to enter stage split" into sc-v2-dev