Merge "DO NOT MERGE: disable iorap in q" into qt-dev