Merge "Add thread_wait to wait g_reprepare_thread is terminated" into tizen_6.5