Merge "Check if the tuner feature is supported before waiting for the TRM service" into sc-dev