Merge "Handle communal transitions during other KTF transitions" into main