Merge "Minor optimization: avoid unneeded computation in DisplayStateController" into main