Merge "Also check if view visible to user before engaging fill" into oc-dev