Merge "Use ComponentCallbacks to recreate on fold/unfold" into tm-dev