Merge "Move tablet resources to product overlay folder" into tm-qpr-dev