Merge "Fix issues with assistant stack visibility."