Merge "Prevent double updateLogicalDisplaysLocked" into 24D1-dev