Added improvement for the advancing screen behavior

Reviewer: Tiff Go

Issue: GCP-9395