Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev