Refactor calling handle_* into a separate task

Change-Id: I8352732328d0009688724f2b2ef8ca90fab16955
Merge "Refactor calling handle_* into a separate task"