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

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