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

* commit 'd0aae5a2226c620c547690039fc06dfdf20ea35d':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.