Merge "Ensure that popupTheme is always specified in the top-level theme." into pi-dev am: 41d7d89c4f
am: 931ee7844f

Change-Id: Idc529924b48b34ae0787962d22107dd0f022ff88