Merge "ChangeScreen2: Use consistent borders on header buttons" into stable-2.8