Merge "Fix sysui depending on slow bt calls" into oc-dev