Merge "Add CategoryAfterPageAdded / CategoryAfterPageRemoved hooks"