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