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

Change-Id: Ifa3676d33b3b2d429a4a9973a3af14375b3c01c1