Merge change 24927 into eclair

* changes:
  Fix a possible NPE in View.