Merge "hbtp_input : Add timeout for wait completion"