Merge "Make sensor op timeout configurable from vendor property" into main