Merge change I1fd58eb1 into eclair

* changes:
  Make video record counter run more smooth. b2154768