Simplification of Selectable and Dispatcher demos

Change-Id: Ic230e7c09ed540105586bb9d55fcd1e3d355f1fe