Merge "Monitor swap" into qt-dev
am: 79a58a7fbc

Change-Id: Ib0f1e9224666a9124991a81a3929b65b288e0430