Remove unneccesary indirection
Check cancellation status in loader mananger
Merge branch 'develop' into refactor-pending
Properly define Android platform
Merge branch 'develop' into refactor-pending