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

Change-Id: I1c594da8ca096344a28c9d4d2ea2f4682f97357b