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