Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev