Merge "Aconfig flag for taskbar customization." into main