Merge "Ignore ActivityNotFoundException from app launch" into udc-dev