Merge "Fix issue #5312624: Lock screen very flickery"