Merge commit 'a6fa6466f81da1bf94e52915b82e7bf1af6e7917' * commit 'a6fa6466f81da1bf94e52915b82e7bf1af6e7917': Fix 2209086: Fix visual glitches in lockscreen.