CB-6109 Refactored to make ActionStack action calls consistent across platforms, updated tests - all green