Merge "Fixed a bug where the expandhelper was expanding to quickly" into nyc-dev am: 48103be6a2
am: cfa59b7d88

* commit 'cfa59b7d88a39169ada712e708cee68c3939548c':
  Fixed a bug where the expandhelper was expanding to quickly