Form field and layout Aria corrections (#11785)

Change-Id: I7625128dd02911230ffc50d5045a88489daa85b4