Merge "Fix layout for Razer Serval"