Merge "(bug 40632) Remove CleanupPresentationalAttributes feature"