Update popup container to match spec.

Bug: 175329686
Bug: 178935485
Test: manual
Change-Id: Ia7507bd4dd6c6db0cdd6a29a0c1d0695aae7d488
2 files changed