Merge change I66ff8af6 into eclair-mr2

* changes:
  Move calc of EriIconIndex/Mode to whenever basis changes