fix Activity's finish processing
commit due to merge
Merge pull request #1 from SawadaShun/develop

Develop