Merge "Contributions: Only add form JS when the form is added"