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