Only signal collection swap on true swap

bug:7484054

Change-Id: I7cb648f64f45711013996be7e2cd0dabdbd614ae