Merge "Skip ListPopupWindow position update if detached" am: c45b10a9cb
am: 3107a17ba7

Change-Id: I9f2f95841e32aa49e4cb80fa57d34f55594931b3