Merge changes Idc1e6e52,If1729a01

* changes:
  Allow different animation lengths in StackStateAnimator.
  Only handle scroll events when over content.