Merge "Re enable remove button after cancel" into qt-dev am: b195c402f3
am: ecb58423a3
am: 3bea5a13b1
Change-Id: I7e5d3357d07ab807cea936364c8762ce6b388b06
This commit is contained in: