Merge "Restrict setting silenced in RecordTrack." into pi-dev