Merge change 26404 into eclair

* changes:
  Show header to user when fields were hidden since they were read-only.