Merge change 26815 into eclair

* changes:
  UI refresh and add default sender indicator