Merge "Don't auto move into restricted bucket if there's a recent interaction" into tm-dev