am c7aab1a9: Merge "Fix 5907223: Fix lock screen glitch caused on devices with a system bar"

* commit 'c7aab1a9f179e85580104cc76bdeda5474885ddd':
  Fix 5907223: Fix lock screen glitch caused on devices with a system bar