Merge "Update cross-task and cross-activity corner radius on config change" into main