am 783fe31b: Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier

* commit '783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf':
  Button fix for torch when no flash available in hw