Merge branch '638-illegalstateexception-when-navigating-out-of-combined-feed-and-back-in' into 'master'

Allow Blog Controller listener to re-attach

Closes #638

See merge request !304