Merge change 22564 into eclair

* changes:
  Add an extra intent parameter for recording duration limit.