Merge "Allow Tuner to update client priority without override the default priority"