Merge "Make ScanCallback methods verbs" into rvc-dev