Specify screenshots by language in a more robust way

This change depends on the following change in BetaFeatures:
I62e90cc2f7fdf8616557c6aeccc64e7787f8aef3

Change-Id: I00241c0a5b046513d822318e273afed65617268f