Merge "6/n Manage multiple task display area in the policy" into rvc-dev