am 2d1fc8a1: am 1493cd63: am 137cd8d8: Call local finish(String) on cancel

* commit '2d1fc8a1a39d4f384bddf141b9d18b9876dc4e94':
  Call local finish(String) on cancel