Merge "Remove activity icon bitmaps from system process." into lmp-dev