Merge "Disable blocking helper" into qt-dev