Merge "Update TaskView corner radius dynamically" into udc-qpr-dev