Merge "Correctly compute visible views" into oc-dev
am: 5cb3d6bea3

Change-Id: I72cb5fe9d3e7f7b5ecfbe03e19489b167f8c2465