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

Change-Id: Idf4cf825e7a30532c18330733573e4960d19e016