Merge "Fix no FillContext when auth for client suggestions"