Merge "Enable CPU rendering option" into qt-dev