Merge "Allow icon add animations when user touches the screen." into sc-v2-dev