Merge "Fix another problem with refreshing the screen when switching to/from overlay"