Merge "Separate volume ui and safety warning configs"