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

Change-Id: I3c6481a585154520fd66274321d2d3ebfbf644a1