Merge "Re enable remove button after cancel" into qt-dev