Merge "Revert "Add falsing to undo button"" into tm-qpr-dev