Merge change 5386 into donut

* changes:
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is targeted.