am ac7348a3: am 10a2979e: Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev

* commit 'ac7348a3228177a0e08b8be2fec88e23b82c6043':
  Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing