Merge "apply changed EFL api of thread"