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

Change-Id: I5c4cc2550771610afa19742ee3ec8f1a75a8d4d5