Merge "Fix layout oscillation at the root of a few bugs." into sc-dev