Bug 949457 - WIP: Make Compose into a flex layout