Merge "Move onInitialBindComplete to ModelCallbacks" into main