Merge "Only add vertical resolver_list padding if showing tabs." into rvc-dev am: 88a6bcaec8

Change-Id: I3c7951da6e62f6cb5ed11cb0f05c45e7a2014ff5