Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev