Smaller design issues we run into after T234205:
- While in Beta, the cog wheel is hidden, but the space is reserved. Can we remove this unnecessary whitespace as long as we are in Beta?
- The height of the popup is not exactly the one we wanted (from T246029) after the cog wheel was added. Patch-For-Review: