Merge "Refactor OverviewComponentObserver for connected displays" into main