Merge "Switch the activity parameter to context." into udc-dev