Merge "Fix a bug with jittering dream overlay." into tm-dev