merge Object.observe-related changes