@aarontam, did you look into changing the logic in shouldShowPageControls() rather than adding the extra condition here?