Merge "Call local finish(String) on cancel"