Merge "Fixing the trigger for aggregated presence." into gingerbread