Merge "Add implicit parent dependency for Preferences" into klp-dev