Merge "Make SF Hint Session safety margin adjustable with a debug prop" into udc-dev