Merge "Improve the docs of the <feature> tag in the manifest"