Just closing the loop here - @merefield has now made the necessary updates to the Pavilion theme component, so it should work well both before and after the incoming core change 
إعجابَين (2)
Just closing the loop here - @merefield has now made the necessary updates to the Pavilion theme component, so it should work well both before and after the incoming core change