Merge "Fix bug #13563247 Settings crash on launch in secondary user"