Merge "Make stub scenes depend on RTL layout in STL demo" into main