am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev

* commit '8a782c9de46cd770a421e4523900584343c8a631':
  Update anchor background on the correct view in PopupWindow