cmfm: Readd drawer toggle item selection

Change-Id: I1d11a96767238dd9c4108b14cff89fa34975c1d6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-11.0' into kk_mkt