Merge "Convert PrivacyItemController to Dependency"