Merge "Refactor: Use AppChipStatus enum instead of isExpanded boolean" into main