Merge "ChangeScreen2: Narrow reply button header spacing"