Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev