Merge changes from topic 'pbcamera'

* changes:
  QCamera3: Refactor HDR+ stream config and request
  QCamera3: Fix jpeg settings for HDR+ requests