Most bugs here pushed to fx-team:
Looked fine on try:
I added a half-dozen blockers that have to do with issues introduced by the landing of phase 2 of the unification on Nightly 39. I think these need to be fixed before we can uplift to Aurora 38.
Bug 1041616 might be another blocker
Try push for the stack of the remaining open bugs:
Try run is green, so phase 2 should be good after reviews.