Return to workspace on unhandled tap if configured

Change-Id: I489d509bb9f73937a8b77a4815052ebdc1ebc5a7
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1