Merge "SF: Fix freezing after follower display mode set" into main