Merge "Remove obsolete state" into qt-dev