Merge "Null out Activity in split controller" into udc-qpr-dev