Merge "Fix issue #4279860: previous UI flashes before showing lock screen..."