Merge "Make ConfigurationRepository and ConfigurationState display aware" into main