Fix Popover positioning (#13974)

Change-Id: I993da6a0608fe471e7da9a49388a4a3d5a507a0f