Merge "Fix issue where panel wouldn't collapse" into pi-dev