Merge "Switch preffered display mode on lock screen" into qt-r1-dev