Merge "Update overview actions alignment" into tm-dev