Merge "Improve code to determine which pages are visible"