Merge "Hide manage & clear affordances on transition to KG" into tm-dev