Merge "ChangeScreen2: Make Reply button configurable"