Merge "Bug 5201321 recover from mediaserver crash" into ics-mr1