Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev
am: 02014a62ab

Change-Id: Ia2637175965656bab350c7d479266093ff5764be