Merge "IconAppChipView wrong position after rotation with menu opened" into main