Merge "Camera: Cleanup hardware key handling" into cm-11.0