Issue #3636977 by jwilson3: Fix Rivet subtheme settings inheritance

James Wilsonrequested to merge
issue/rivet-3636977:3636977-subtheme-settings-inheritance into 1.2.x

Closes #3636977

Merge request reports