Merge "Adds aconfig flag for Lifetime Extension into NMS" into main