Merge "Handle non-exact measure passes in ZenModeView."