base

Handled expandability and swiping while guts are exposed

Also fixed a bug where the wrong guts were selected with groups.

Change-Id: I3677ce549b2a90e2dc225470cff4e2548ddca81a
Fixes: 29046865