Merge "Fix optional expanders logic to not require custom views" into main