Merge "Add rounded corners to TaskMenu Items" into sc-dev