Make Popover compatible with odd scrollbar hacks related to (#12736)

Change-Id: I4845869fe0dca9ecfff14831d8b39bd4648fba89