Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev