am 0bcfc537: Merge change 5386 into donut

Merge commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d'

* commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d':
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is