am e8d6dc4c: am 865cffc7: Merge "Add null check in ViewOverlay" into jb-mr2-dev

* commit 'e8d6dc4cad65c8c29c365d71d2255eb637581fdb':
  Add null check in ViewOverlay