Merge changes Ie1001586,Ib4fcae7d into cm-11.0

* changes:
  Framework: Add option to always show battery status on lockscreen (1/2)
  Remove 'Allow custom buttons' checkbox (1/2)