Merge "Don't call invalidateHwcGeometry when handling transactions" into sc-dev