Merge "SF: remove wp<Layer> from LayerHistory" into sc-dev