Merge "Add tests for LayerStack::ApproximateMatch" into sc-dev