Merge "Move bypass default value to framework" into qt-r1-dev