am 04476691: Merge "Remove over-aggressive stack movement." into klp-dev

* commit '04476691424811f5029194410519f49f913b672d':
  Remove over-aggressive stack movement.