Merge "Update BT folder icon." into gingerbread