Merge "Reuse existing repositories for DisplayStateRepository" into main