Merge "PLURAL support for list lengths in default-skin-not-found"