Fix Google Setup Wizard jank

* Don't remove location page.
* Remove Google Setup wizard page upon completion
to match CMAccount behavior
signed by: Carlos Jesús <xxx.reptar.rawrr.xxx@gmail.com>

Change-Id: I0ba6581b8ca3e406b1e9ab93512ef8cc10a2e73e