Merge "Resolve update system audio route NPE and foreground updates" into main