Merge "Refactor editor layout file dependencies out of common."