Merge "Fix flicker when task move to back" into sc-v2-dev