Merge "Bug 5353255: use a switch to toggle accounts & sync"