Merge "Fix comments in DisplayWhiteBalanceController"