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