Merge "Fix activity weirdness by doing the right thing" into nyc-dev