Merge "Legacy smartspace alignment fixes" into sc-v2-dev