Merge "Remove unused reverse param from layout algorithm" into sc-dev