Merge "Refactoring instance variable for ArrowPopup.java" into udc-dev