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

Change-Id: I2800dccca0869637cf87a6f1354ca3cea4b258c4