Merge "Monitor swap" into qt-dev