am 73e087d1: Merge "Fix issue with spring loaded mode" into honeycomb

* commit '73e087d19ef42e7e1b8af1cdcf5c272b8a1d8df5':
  Fix issue with spring loaded mode