Merge "Tests for PopupMenu" into mnc-ub-dev