Change when {before,after}Resolution() are called to make these hooks more useful

Change when {before,after}Resolution() are called to make these hooks more useful #18706