Merge changes Ic7fd2787,If97579fd

* changes:
  Camera: notify AE trigger ID change
  Camera: fix camera ID in flashlight control