Fix bug 872618 - Import "Make sure components and properties are correctly hydrated" patch. r=lightsofapollo