Merge changes Id36d9ea9,Ib1b3f307 into dev/msm-4.9-camx

* changes:
  msm:camera:icp: Reducing expiry period device timer
  msm:camera:icp: Creating separate timer workqueue