Merge "Prevent starting face detection twice." into ics-mr1