Merge "Instead of storing AppIconDrawable store bitmap." into main