Merge "Add debug logging to StackScrollAlgorithm" into tm-dev