Merge "Switch preffered display mode on lock screen" into qt-r1-dev am: 311e1db11d
am: 1edecabca9

Change-Id: I272f11fead11ebd20faa594438122eb97e559702