Merge "Revert "Fix wrongly applied material theme for StandardMenuPopup"" into main