ANDROID: Change in 'edit' option breaks giphys

Heeeey

Who broke it? I'm looking at you @Jake!

Okay so I'm going to demonstrate in the comments so just try to keep up.

(so sassy today)

Issue: When I make a comment with the giphy button and it results in an inappropriate giphy OR I want to append it with some text as one may want to do... I click the edit comment button.

However, recently this started messing with things as the comment defaults to giphy mode despite having input text which will then break the original giphy and result in square brackets all over the place.

See comments for a live example...

Hardware: LG G4 running 6.0

App version: 1.0.6-69