Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev