Merge "Update cancel and cast icons" into pi-dev