Merge "Do not show assist affordance when no assistant is available"