Merge "Add support for fromSource in nested scroll" into main