Merge "Limit the number of commands in OverviewCommandHelper" into tm-dev