UIViewRoot.restoreViewScopeState(...) is not being called from DefaultFaceletsStateManagementStrategy

Checking some examples I have found a typo error in DefaultFaceletsStateManagementStrategy line 319:

Object viewRootState = states.get(view.getViewId());

It should be like this:

Object viewRootState = states.get(view.getClientId(context));

The effect is build view time tags like c:forEach and c:if that uses view scope beans does not work as expected.