Merge "Reapplying r45820 to support the NewSignupPage extension."