Merge changes I2139274e,I1d18d936 into camera.lnx.1.0-dev.1.0

* changes:
  SnapdragonCamera: Fix occasional touch AF/AEC detection failure.
  SnapdragonCamera: Hide remaining photo counter