Merge "Adding settings screen for font size. Also factored out common components from screen magnification settings screen."