Merge change 26625 into eclair

* changes:
  Fix http://b/2139600 (expander indicators misaligned).