am 92acbf6c: Merge change Ie07be885 into eclair

Merge commit '92acbf6c5a5c654bfdaa871afc891a8723acebf8' into eclair-mr2

* commit '92acbf6c5a5c654bfdaa871afc891a8723acebf8':
  Fix issue 2259506 and 2262817 by keeping a reference to MediaProvider when camera is active.