Merge "Move tuner constants to Tuner.java" into rvc-dev