Merge "Add textZoom setting"