Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev