Merge "Fix DisplayObserverTest" into main