Merge "ChangeScreen2: Fix click inside of messages" into stable-2.8