Merge "Use bottomMargin to align OverviewActions with 3 button" into tm-dev