Sync from production marionette-js (state baseline before streaming-move work)

8d21814