and merge the expander and the "show preview" checkbox
to be the same thing, i.e. expanded is showing, and
not expanded is not showing

Change-Id: I10e43bc36a0e2e5d1286a4dbad793ee3a700c97c