Is the Awkward ‘Diversity Era’ of Hollywood Behind Us?