Fixes for ERRAI-817, ERRAI-821

Deferred initialization in StyleBindingCodeDecorator