Merge "Add overlays to views" into jb-mr2-dev