Merge "Add null check in ViewOverlay" into jb-mr2-dev