am 1fd6c336: (-s ours) Fix issue #5312624: Lock screen very flickery

* commit '1fd6c33620171893b2e92c38b731fd89e5a8dd66':
  Fix issue #5312624: Lock screen very flickery