Merge "Update calculation method for Overview UI placement on tablets" into tm-qpr-dev