Merge "Use new "deferred fragments" feature on People" into ics-mr1