Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev