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

Change-Id: Idbce18de16137bd30e29ca29ada5fbd9dacf57ba