Merge "Undeprecate LayoutAlgorithm" into ics-mr1