Merge "Change tile height to 80dp" into tm-dev