Merge "Fix the case where an intent bounces several times between users." into mnc-dev