Merge "Refactor syncing between communal STL state and KTF" into main