Merge "Apply the correct activityOption" into udc-qpr-dev