Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev