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