Merge "Allow overriding getOptionsPopup test method." into sc-v2-dev