Fix to downgrade v7 compat due to L.
Merge branch 'master' into removed-view-test