Merge "Fix activity capture crash for watches" into nyc-mr1-dev