Merge "Remove 'Allow custom buttons' checkbox (1/2)" into cm-10.2

Change-Id: I416d9b203a05d3684d7787a9d58d2278765b4d13
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2