Merge "Calculates visibility in queryIntent* methods" into rvc-dev