Fix lightbox templatetag error on non-wagtail pages
Merge branch 'feature/push-state' into staging