Merge "Improve systemui unlockscreen jank issue" into main