Merge "Reduce camera record / play repetition to avoid 10mins time-out bug: 5906885" into ics-mr1