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

Change-Id: I6423fdf7e7bcd2211dc3998ef82e0f9d7e5d8635