Move addClass calls to setup in GeneratedContentNodes

Ensures classes persist on content update.

Change-Id: I4828ad3208351e4b00e0be1f905b7eafd5e5e93b
Merge "Move addClass calls to setup in GeneratedContentNodes"