Merge "Reduce view selected button text char limit" into udc-mainline-prod