Merge "Add a new flag for desktop mode proto 2" into tm-qpr-dev