Merge "[Panlingual] Remove the scrollbar in caregory textview" into udc-dev