Merge "wait for sensor service before starting WMS"