Merge "Removed page spacing scaling" into sc-dev