Merge "Fix issue with spring loaded mode" into honeycomb