Merge "CameraService: Notify flashlight about device close" into nyc-mr1-dev