Merge "Give hidden API behavior to legacy apps." into rvc-dev