Merge "Decide on navigation to task by policy in Virtual Device" into tm-dev