Chatpulldown

[jisqyv]

General items:

• [ ] I have updated the relevant documentation files under docs/
• [ ] My code follows the:
  • [ ] Google Java style guide (for .java files)
  • [ ] Google JavaScript style guide (for .js files)
• [ ] ant tests passes on my machine

If your code changes how something works on the device (i.e., it affects the companion):

• [ ] I branched from ucr
• [ ] My pull request has ucr as the base

Further, if you've changed the blocks language or another user-facing designer/blocks API (added a SimpleProperty, etc.):

• [ ] I have updated the corresponding version number in YaVersion.java
• [ ] I have updated the corresponding upgrader in YoungAndroidFormUpgrader.java (components only)
• [ ] I have updated the corresponding entries in versioning.js

For all other changes:

• [ ] I branched from master
• [ ] My pull request has master as the base

What does this PR accomplish?

Description

Fixes # .

Resolves # .

[jisqyv]

Note: This PR has two temporary commits, which duplicate #3233 which will be removed when that PR is merged and this PR rebased onto master

[jisqyv]

Rebased on master and temporary commits removed.

[jisqyv]

The change I just pushed up rebases this PR on master, it doesn't address any of the review comments. There will be a follow-up change pushed today that does. I've done this in two steps to make it easier to see the changes I make without the changes from the rebase getting in the way.

[jisqyv]

I just changed the base from master to ucr because I'm about to change the blocks language version (and YAVERSION as a result)