Merge "Decrement while removing from secondary lists" into qt-dev