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

Change-Id: I234d9aff45339d501669f05e3dafa9969542d2bc