Merge "Altering homescreen spacing to match design."