Merge "Add propogating current state when adding a callback" into main