Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev