Merge "Catch IllegalStateException in screenshot media player" into main