Merge "Hide App Chip for smaller app in 90:10 flex split" into main