Merge "fix draw size and style display" into gb-ub-photos-carlsbad