Merge "Add resume action button for new layout" into tm-dev