Merge "Controls UI - Constrain status to increment of stepValue" into rvc-dev