Merge "GL packaging refactor" into gb-ub-photos-bryce