Merge "Move DisplayStateRepository flows in the background" into main