Merge "Removed subtext from side fps enrollment flow" into udc-dev