Merge "Prevent double updateLogicalDisplaysLocked" into main