Merge "DO NOT MERGE: Backport of "Use mailbox lookback (if available)..."" into honeycomb-mr1