Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
am: c684e636fc

Change-Id: I504d4f969f8a2f7df3db28a74069ef03a7d4e834