This reverts commit c17f3924. Also cancel background surface color animation. Change-Id: I82e436db653378f5097beee22594f64eaa2bb3bd