Merge "Fix Sysui crash on volume change." into nyc-dev