Merge "Fix flicker when unlocking the screen." into sc-v2-dev