Merge "Use isDisplayed instead of isOnScreen" into main