Merge "Fix a crash when resuming sound setting with AfW on Ryu"