Merge "Use Tuner Resource Handle instead of Resource Id in TunerResourceManager"