Merge "Correctly compute visible views" into oc-dev