Merge "Update dream state controller to hold weak ref to callbacks." into main