Merge "Fix ScrollViewFunctionalTest running on Test thread" into main