Merge "Add KitKat wifi and battery icons." into lmp-dev