Fixes: 32255388 Test: Ensure viewport no longer drifts when scaling Change-Id: I1b12aeaa8e1d0282d6c35a27ee061f6cd7b0a667