Fix pillar overlay bug

This was the underlying cause of that most confusing issue outlined in #12098 where we saw pillar overrides rendered in seemingly random ways.

@thatch45 Please give this careful consideration. I believe this is the intended behaviour but it may dramatically change the way pillars are applied for people who are used to the original behaviour. 

If approved, this will need to be forward merged.

Closes #12098