Prevent one app from blocking all download threads + fix getIconResource am: 3146501f34 am: b4471c4cd5 am: 96b05378d0
am: 89f466c8d8

Change-Id: I3e70f6b726c16813ac086580ba010ed487bd449d