Merge "Fix the flicker in the Lock screen page" into 24D1-dev