Merge "Fix "show system apps" status lost when switching on/off dark theme"