Expando collapse positioning fix for mobile
Merge commit