Merge "Refresh the buttons CDM dialogs" into tm-dev