Merge "Fixed leak of app token in exiting list." into oc-dev