Merge "Camera: Powerkey shutter (2/2)" into cm-11.0