Merge "ChangeScreen2: Allow scrolling while reply box is open"