Merge "Remove the extra line below context button" into tm-dev