Merge "Fixes NPE in list from PrivacyItemController"