nicki: Fix enter and back in swipe

and cleanup

Change-Id: I608b932bb61064f52177bccf7e6061dc5b14b3be
Merge remote-tracking branch 'cm/cm-11.0' into HEAD