Merge "Add flag for launcher pill" into main