Merge "Handle emergency call back mode correctly" into ics-mr1