Merge "Remove burn in offset on lock screen." into qt-dev