Overflow height and spacing polish

Bug: 148878788
Test: manual
Change-Id: I6c8e0326500da88f849cb62b3718dfdf454227d0
4 files changed