Merge "Use formal API for ActivityThread to set proxy" into sc-dev