Make field labels appear disabled in sync with the field

Change-Id: I8798e5338c9581f0dfba73647a05a3df1d67757c
Merge "Make field labels appear disabled in sync with the field"