Merge "Combine discrete listener methods into single state update" into qt-dev