Merge changes Ia6047e64,I81d9b2d1 into camera-SnapdragonCamera.lnx.2.0

* changes:
  fix confilct on HFR and Time Lapse option
  fix apply wrong earlyPCR value after HFR