Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev