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

Change-Id: I5cda3a684ec96897cd2bafe9e81c350877244475