am f4857ffa: Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier

* commit 'f4857ffa50a4fe6fcead0abde524376c0e9d6a5a':
  When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.