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

Change-Id: I63d4a0c932da6d1b324d0776840716ccc77d8d3f