Merge "Fix RAs with different retansmission timer would be dropped by apf"