Merge "Add entry point of screen zoom to accessibility and font size to display. Also removing large text preference."