Merge "Fix ActivityNotFoundException" into udc-qpr-dev