Merge "Update TAPL to operate on folder icons." into sc-v2-dev