Merge "Revert "Add flag for launcher pill"" into main