Merge "LockScreen: allow long-press actions from hardware keys (1/2)" into cm-11.0
Merge "Camera button support (1/2)" into cm-11.0