Merge "Remove the disableSelf() api" into qt-dev