Merge changes Iefcaf262,I9c397d83

* changes:
  Fixed a bug where the expand icon could show but nothing happens
  Improved expand accessibility experience