Revert "Add method to set whether or not the overlay should be kept when video surface deactivated."

This reverts commit 6eebf5ecd1b9cfd6b91167694a405712b795afe8.