Merge "Reduce needless recoverBuilder calls when updating Notification icons" into main