Merge "add content descriptions for filmstrip controls" into gb-ub-photos-denali