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

Change-Id: Ie228bc6ab839464d46cff87f1821d18de1b31d16