Merge "Ensure that popupTheme is always specified in the top-level theme." into pi-dev