common: Allow disabling of O-Click settings

Change-Id: I16764a1fce8f1766be86322e1caf85c1263af196
Merge branch 'cm-11.0' into kk_mkt