Merge "Tune menu size" into tm-dev