Merge commit '86d860439a34ec8001cbedf0f5eb1a7f162eb812' into eclair-mr2-plus-aosp * commit '86d860439a34ec8001cbedf0f5eb1a7f162eb812': Fix 2209086: Fix visual glitches in lockscreen.