Merge "Fix memory leak in ManageApplication"