Merge "Undo isDataCapable as Public API" into rvc-dev