Merge "Scrim: Do not interact with scrim with hint" into tm-dev