Merge "Add the cancel button handler"