Merge "SF: Remove flag check for modesetting lock" into main