Merge "Tune effect of motion on KF/GF boost in two pass;"