Merge "Add targets for tablet/tv product variants" into tm-dev