Merge "Do not capture activity snapshot if starting window is associated to task." into udc-dev