Merge "Create DisplayStateController"