Merge "Fix bug #15080198 Enabling developer options requires restart of settings to enter"