Merge "Avoid the scenario Where taskdisplayarea is null" into sc-v2-dev