Merge "[AAPM] Don't rerun all callbacks on register" into main