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

Change-Id: I4c3749b185f4abf147d5c9d88cc404c53063f1d5