Merge "Update cancel and cast icons" into pi-dev am: cf2dc360bd
am: a219ed30df

Change-Id: I9857a7e87943426b1a7759526448690351239d89