Merge "Improve long press menu readability" into tm-dev