Merge "Remove unnecessary UWB functions" into sc-dev