Merge "calculate kdbus timeout based on user timeout" into tizen