Merge "Reset AppChip chevron when closed" into main