Merge "Merge "Switch preffered display mode on lock screen" into qt-r1-dev am: 311e1db1 am: c8359c55" into qt-qpr1-dev-plus-aosp