Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting And 2098232: "Set unlock pattern" should be at the top of the section
