Retemplate Long labels for text inputs in display:table style

Closes-Bug:#1333580

Change-Id: Ic44f808a051fb853ec734d11da749dcfc8700e12
Merge "Retemplate Long labels for text inputs in display:table style"