Merge "DO NOT MERGE: Clear assistant stack after determining display" into oreo-cts-dev