Merge "Draw UI fixes" into gb-ub-photos-carlsbad