Merge "Developer Options module" into qt-dev