Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps
Merge m-c to s-c.
Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me
Merge m-c to s-c.