Merge "Increase deringing horizontal padding to 4 pixels on each side" into nextgenv2