Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev